multipress: Only emit preedit signals if needed

When clearing the compose buffer, don't emit preedit-changed
unconditionally. This triggers a recursion which leads to
a crash.

https://bugzilla.gnome.org/show_bug.cgi?id=753644

diff --git a/modules/input/gtkimcontextmultipress.c b/modules/input/gtkimcontextmultipress.c
index 9cfe0289af2464a146bc9d9d137778d8fbd0b1e7..b92570bdbd441a911285d1a9feb51b08fa46b608 100644 (file)
--- a/modules/input/gtkimcontextmultipress.c
+++ b/modules/input/gtkimcontextmultipress.c
@@ -170,11 +170,14 @@ clear_compose_buffer (GtkImContextMultipress *multipress_context)
   multipress_context->key_last_entered = 0;
   multipress_context->compose_count = 0;
 
-  multipress_context->tentative_match = NULL;
   cancel_automatic_timeout_commit (multipress_context);
 
-  g_signal_emit_by_name (multipress_context, "preedit-changed");
-  g_signal_emit_by_name (multipress_context, "preedit-end");
+  if (multipress_context->tentative_match)
+    {
+      multipress_context->tentative_match = NULL;
+      g_signal_emit_by_name (multipress_context, "preedit-changed");
+      g_signal_emit_by_name (multipress_context, "preedit-end");
+    }
 }
 
 /* Finish composing, provide the character, and clear our compose buffer.